Switch license to GPLv3 or later.

diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index d2d5deae2f7ab98964df4810378c389de787bd6b..8ecc335523b56fde84f75d07a92d5aeae404b3d4 100644 (file)
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 51d547a71c4706d49ebe454a0e5d7383789d43e8..17d930a055def62592d189f70496bcfeac9a5406 100644 (file)
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index b727bb05932052c080d7e7902a7a752f312007c0..458f6918de45f313990751b7347d3bc54c747456 100644 (file)
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index e0f39eea262f2236119d70e98fd408e88f269c2b..7247033a23550ac4d49c0bf5c173ca615ec277b4 100644 (file)
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 2b308d5c6a1f677640406ac64d9303bb0325c7c8..0000cae5adf89195c8dbd7f5c89f08053fef6fac 100644 (file)
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 859a8a07c38e129b4789382d4624c4762f50a1ff..5d68fdf94370fbb9832b075a9c4a9129aff2afa9 100644 (file)
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 2fd0c4855625ba81b1a6770ae9a2e7e19d5c7b25..88e154239561e134bdeaf70d6fa45ffac1dbfa43 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 0473ef22973bad38c44c4b396d6d5acab073e5f5..d6b4f3aed29b8ddafd6b46893eca24c2b9bb0654 100644 (file)
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 71e34346d778d26b1e76bc0bdbad74b33541fc4c..a7f68e4e222d3d475c1ecc54dc8a2174e11a27e9 100644 (file)
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 03c60988e583d5d2e8ffb5908306667fff05393b..ddbf74f5c42da1bea7d95cdd38b61e3076c22331 100644 (file)
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index c1488f47234bd48845f91363206c1fe840081244..898f0b9d301f62873048c787ff2548efc506ecd0 100644 (file)
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 92f077cd5976d29d89da232b8eabfa4ead535c91..50fdc3cccccec193ba66ac540ea3c00cab613a89 100644 (file)
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index f9aed42e3ce6e63d5fa49cfa070083ec9e1bc994..f99a64bd17d6758e9b86094dc866881de09da230 100644 (file)
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index bb4054732397dac716bc5a92e6139bde108aa592..541773a4b5bf3ab14aef96474d82e9058e7c83ad 100644 (file)
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 9c55fe16b6dccd46fe06a9e06b41a461e08dac58..6dc02517ec10cce268be1d46dc24d7229af2ba40 100644 (file)
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 347ab69ff170cd73fbff6005b3e4fc977ea3e866..bd48afb6bd6c6d80ba1fb91b96f39b18d9021571 100644 (file)
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 9a5ead5ddffbd7347297ff05bdae25b341692055..011e2a55520fe718ab6f0aa540c7123c3567f206 100644 (file)
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 2b48bad0166584dca9c561737b5e13cd4319bfd8..d3194f3625aefa2bac49a273f02e0701f25d79e8 100644 (file)
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 6951d580fdc76997d81465b913408589c333dd5a..11090f97b83be15f1272d6218b3fa58f7bda0b4e 100644 (file)
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index f9684601fc4da4a33bfe5c797b8d399aa606a9e2..897f9942d47a8810b76de2bc7932fa8410f25f4a 100644 (file)
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el
index a0219beca63d141968d9b321560e3cf8561b9303..61a4ef9510d94aab623c31c862c0d3b1a2feaf4c 100644 (file)
--- a/lisp/eshell/esh-maint.el
+++ b/lisp/eshell/esh-maint.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index c6abda631dc677de2c4f5b484856fb14a84fa565..e6e47d6b980bec3915a260d6e8c6f3df91a48bc5 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 822caf549332454e071843cdb7a7df7aca4d6855..1706719790999deeb424c08e682a0018b5c52010 100644 (file)
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 8e7b44174ce5f6209bbe946b6144d949dab88456..41e12e70b43ccef537d6a5d39bca9ae72e5f3174 100644 (file)
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 96d8255a3abfad7c871f4bd4e3c6f06847fa70f8..fb226cf51fbababd5d1f75289511cc0d063afabe 100644 (file)
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index ed1e75eb4dfa0cfc4c2a648c5d6dbb0249298dce..b4d65fa1f5e025ebc5e91e244b24b63d47574b54 100644 (file)
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index ce309aaaf9ee221205b4b0019a4ec56764337932..25afdc38506f4c03e0022f36bbc2dcfc5454aeef 100644 (file)
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index b116df456bfffb8df70fd4b553b2cec21e34f2ad..7c04b5a942aa4612ff4a4aeaf04ce1effd49d031 100644 (file)
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index d7910dc252d23cc22efc9d486487937911e049e2..23e361491748172d0b72a7ff1ee4839567d5fa17 100644 (file)
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -77,7 +77,7 @@ the tasks accomplished by such tools."
 ;;
 ;; Eshell is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; This program is distributed in the hope that it will be useful, but